Skip to content

fix: Backport block tag preservation fix to 2.8.x (#1312)#1315

Draft
jasmith-hs wants to merge 6 commits intomaster-2.8.xfrom
jasmith_hubspot/backport-1312-2.8.x
Draft

fix: Backport block tag preservation fix to 2.8.x (#1312)#1315
jasmith-hs wants to merge 6 commits intomaster-2.8.xfrom
jasmith_hubspot/backport-1312-2.8.x

Conversation

@jasmith-hs
Copy link
Copy Markdown
Contributor

Description

Backport of #1312 to master-2.8.x so the block reconstruction/execution order fix is available in jinjava 2.8.4. The original fix addressed values not being resolved properly when used in blocks that have been deferred in their extends roots. Cherry-picked cleanly with no conflicts; all tests pass.

Authored by Claude Code

BRAVE

Backwards Compatibility

This is a direct backport of an already-merged fix from master. No new API changes.

Rollout and Rollback Plan

Standard library release. Rollback by reverting this PR or not publishing the 2.8.4 release.

Automated Testing

Tests added in the original PR are included in the cherry-pick: block reconstruction order tests, deferred block resolution tests, and multi-level block inheritance tests.

Verification

All 184 EagerTest tests pass locally with 0 failures.

Expect Dependencies to Fail

No expected downstream failures — this is a bug fix.

REVIEWERS: Please review both the code changes and the answers above, and validate that they match the expectations for BRAVE

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant